Merge.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 3 Aug 2010 20:03:09 +0000 (21:03 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 3 Aug 2010 20:03:09 +0000 (21:03 +0100)

Trivial merge